Skip to content

Comments

Merge development to main#364

Merged
peverwhee merged 2 commits intomainfrom
development
Feb 13, 2026
Merged

Merge development to main#364
peverwhee merged 2 commits intomainfrom
development

Conversation

@peverwhee
Copy link
Collaborator

@peverwhee peverwhee commented Feb 13, 2026

Tag name (The PR title should also include the tag name): n/a
Originator(s): kuanchihwang

Merge development to main. Includes:

nusbaume and others added 2 commits January 22, 2026 09:10
Originator(s): nusbaume

Description (include issue title and the keyword ['closes', 'fixes',
'resolves'] and issue number):

Add namelist modifications and additional helper schemes in order to run
the full CAM4 physics suite in CAM-SIMA in aquaplanet mode.

List all namelist files that were added or changed:

A schemes/radiation_utils/radiative_gas_concentrations_namelist.xml
- New namelist variable to set the concentrations of radiatively active
gases.

M       schemes/cloud_fraction/compute_cloud_fraction_namelist.xml
M       schemes/gravity_wave_drag/gw_common_namelist.xml
M       schemes/radiation_utils/solar_irradiance_data_namelist.xml
M       schemes/rrtmgp/rrtmgp_constituents_namelist.xml
M       schemes/zhang_mcfarlane/zm_conv_options_namelist.xml
- Add new namelist values for CAM4 and/or aquaplanet CAM-SIMA
configurations.

List all files eliminated and why:  N/A

List all files added and what they do:

A       schemes/radiation_utils/radiative_gas_concentrations.F90
A       schemes/radiation_utils/radiative_gas_concentrations.meta
- New scheme which sets the global concentrations of radiatively active
gases using hardcoded namelist values.

A       schemes/utilities/set_surface_coupling_vars.F90
A       schemes/utilities/set_surface_coupling_vars.meta
- New scheme which sets the outgoing (i.e. `cam_out`) coupler variables.

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)

M       schemes/rasch_kristjansson/prognostic_cloud_water.F90
- Move subroutine call outside of loop to improve performance (found
during CAM4 aquaplanet debugging).

M       suites/suite_cam4.xml
- Update CAM4 suite to allow for a complete CAM4 physics run in CAM-SIMA
when in aquaplanet mode.

M       suites/suite_cam7.xml
- Add commented-out 'set_surface_coupling_vars' scheme, as it will be
needed for an eventual CAM7 simulation in CAM-SIMA.

List all automated tests that failed, as well as an explanation for why
they weren't fixed:

Is this an answer-changing PR? If so, is it a new physics package,
algorithm change, tuning change, etc?

Yes, at least for full physics CAM4 aquaplanet simulations. This PR
introduces new schemes and namelist values to the CAM4 physics suite,
which is what allows this configuration to run in CAM-SIMA.

If yes to the above question, describe how this code was validated with
the new/modified features:

Performed a short, three month run and examined the model output, at
least for some generic state variables (U,V,T,Q,PS). All of the results
seemed reasonable, and the model successfully ran to completion.

---------

Co-authored-by: peverwhee <courtneyp@ucar.edu>
Co-authored-by: Cheryl Craig <cacraig@ucar.edu>
Co-authored-by: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Co-authored-by: John Truesdale <jet@ucar.edu>
Co-authored-by: Haipeng Lin <hplin@ucar.edu>
Co-authored-by: Jian Sun <sunjian@ucar.edu>
Co-authored-by: Haipeng Lin <myself@jimmielin.me>
### Originator(s):

kuanchihwang

### Descriptions (include the issue title, and the keyword ['closes',
'fixes', 'resolves'] followed by the issue number):

This PR adds the Mellor-Yamada-Nakanishi-Niino (MYNN) surface layer
scheme to the experimental convection-permitting physics suite.

### List all namelist files that were added or changed:

None

### List all files eliminated and why:

None

### List all files added and what they do:

```
A       .gitattributes
  * Make GitHub Linguist recognize `*.pf` files as Fortran source code
A       schemes/mmm/sf_mynn_compat.F90
A       schemes/mmm/sf_mynn_compat.meta
  * Implement MYNN surface layer scheme
```

### List all existing files that have been modified, and describe the
changes:

```
M       .github/workflows/unit-tests.yaml
  * Do not hard code path to working directory in GitHub Actions
M       .gitmodules
M       schemes/mmm/mmm_physics
  * Update git submodule of MMM physics
M       schemes/mmm/CMakeLists.txt
M       test/unit-test/tests/mmm/CMakeLists.txt
  * Synchronize `CMakeLists.txt` of MMM physics with MPAS dycore in CAM-SIMA
M       schemes/mmm/cu_ntiedtke_compat.F90
M       schemes/mmm/cu_ntiedtke_compat.meta
  * Fix incorrect standard name in new Tiedtke convection scheme
M       schemes/mmm/mmm_physics_compat.F90
M       schemes/mmm/mmm_physics_compat.meta
  * Implement interstitial schemes for MYNN surface layer scheme
M       test/test_suites/suite_convection_permitting.xml
  * Add MYNN surface layer scheme to convection-permitting suite
M       test/unit-test/tests/mmm/mmm_physics_compat_tests.pf
  * Implement unit tests
```

### List all automated tests that failed, as well as an explanation for
why they were not fixed:

None

### Is this an answer-changing PR? If so, is it a new physics package,
algorithm change, tuning change, etc?

Answer-changing for the convection-permitting physics suite due to a
newly added physics scheme. Nothing is changed for the rest.

### If yes to the above question, describe how this code was validated
with the new/modified features:

The convection-permitting physics suite is considered an experimental
feature. There is no baseline available to validate against because it
has never been implemented in CAM-SIMA as well as CAM before.
Copy link
Collaborator

@nusbaume nusbaume left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @peverwhee!

@peverwhee peverwhee requested a review from jimmielin February 13, 2026 19:38
@peverwhee peverwhee merged commit 64dc72a into main Feb 13, 2026
7 checks passed
@cacraigucar cacraigucar removed their request for review February 13, 2026 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants